Merge version 5.10.1+dfsg-5+rpi1 and 5.10.1+dfsg-6 to produce 5.10.1+dfsg-6+rpi1

diff --cc debian/changelog
index a64e3e1405582509b78cb11ce83853f602e45a2e,0c8e40d4d4296fd6e322a539a3b56738b3c42ed9..42b4118aabbd335489c91a59824959d2692d377d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- qtbase-opensource-src (5.10.1+dfsg-5+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.10.1+dfsg-6+rpi1) buster-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Apr 2018 02:16:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 May 2018 01:47:18 +0000
++
+ qtbase-opensource-src (5.10.1+dfsg-6) unstable; urgency=medium
+ 
+   [ Simon Quigley ]
+   * Add my name to Uploaders.
+ 
+   [ Dmitry Shachnev ]
+   * Backport upstream patch to fix loading OpenGL library in the GLX
+     integration plugin (closes: #886400).
+   * Replace hidpi_scale_at_192.diff with a version that has been applied
+     upstream (closes: #884956).
+   * Update symbols files from buildds’ logs.
+   * Bump qttools5-dev-tools (indep-)build-dependency to 5.10.1.
+   * Bump Standards-Version to 4.1.4, no changes needed.
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Wed, 02 May 2018 20:50:22 +0300
  
  qtbase-opensource-src (5.10.1+dfsg-5) unstable; urgency=medium
  

diff --cc debian/patches/series
index 816830931f56853775268a3ed6b050652853977d,5107bff286986825c8d3d4d35e6648d83c56e65b..6e35c4dba7941955e2c9ff268e1f49859ab4c600
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -13,6 -15,3 +15,4 @@@ gnukfreebsd_linker_warnings.dif
  armv4.diff
  nonlinux_utime.diff
  no_arc4random_buf.diff
- # Not yet forwarded.
- hidpi_scale_at_192.diff
 +modify-configure.json-to-disable-neon.patch